Trying to fix commit trash happening between branches