Fix merge/build