Forgot to replace conflicting files with resolved ones. Re-commiting