Removed redundent filr during merge