fixing merge stuff