commiting changes for pull
fixes conflict in schema