merge faux commits