Edited a lot of files, creating new branch
Trying to merge files