merge changes made for project atomic