fixing the conflicts while storing bucket data