add always look on the bright side
resolve conflict