fixing merge conflict - removing Deere1280x800-WXGA