fixed collision bug introduced in merge