Fixed issues caused by merge