brute force merge conflict -- FTW