fixing properties merge
Fixing permissions
More formatting fixes