cleaning LP projects
merging + conflicts