update bash settings
resolve conflicts