Merge conflicts
Merge conflict fixed
Comitting
Merge conflicts
Compiled Buddhabrot