troubleshoot reverse order
branch
remove attr accessor
resolve conflicts
update gemlock
fix conficts