Migration VCS conflict detection and --merge for makemigrations