Moving files that were committed to the wrong branch back into master