Resolve build.properties conflict