fixing merge conflicts and adding RolandasRazmas changes