Resolve build.properies conflicts