fixing some code conflicts