Cleaned up files to obey our Checkstyle running our config
Hopefully fixed merge conflicts