Deleted Eclipse .settings from source control. Branch sync with master did not cleanly merge this due to conflicts.