MERGE CONFLICS REQUIRES MORE CARE!