merging connie to master