Manual merge because branch was fail