Merging for Eclipse warnings

I don't know how to git yet :/