Fixed Conflict -- If you have an error don't force

Do not force commit unless you know the error please otherwise do go
through the filemerge and make sure it won't override anything