Fixed issues with merged files