[41]fixing merge conflicts