re-adding project.properties
merging in latest
trying again to merge in latest
merging loginactivity