Rearranging things
Merge conflict