commit local changes
fix conflicts