Committing to get us synced up
Committing resolved conflicts