Finished fixing merge conflicts
Finished fixing merge conflicts again