Fixed issues with merge.