building form
resolved gem conflicts