Force resolve conflicts / Updated TODO