Removed the merge files and added clearfix