resolved a few conflicts (iml, gradle and local.properties)