Project updates
Conflict fixes