Solved conflictd state