Please follow these things, so your code can be merged seamlessly.
- Use 4 spaces for indentation
- Use ' instead of " for strings
- Use cherry-picking to avoid unnecessary commits in the pull request
- Maybe squash your commits before pull requesting
- Revert accidents instead of changing them back with a new commit
- Test your and rest of the code