Pro tip: Always work in separate branches and merge master/develop to your own branch before attempting to merge your branch back into master/develop