Hopefully creating a branch
Merged and removed conflicts