aliases updated
resolve conflicts