Resolved some last seen conflicts