fixed collision conflict