branch
remove attr accessor
resolve conflicts
update gemlock