Delete MappingBuilder.java.rej

It looks like merge conflict file has been commited...