Refined the chin
Fixing merge problem
Finally actually fixing conflicts