Build after new merge