Make graphics in the right way
Fix merge conflicts