Fixed issues of merge