Fixed xfwm4 XPM3 definitions and cleaned out unresolved merges to favor HEAD.