Only added staged chagnes
 Committing with known conflicts
Resolved conflicts, hopefully