made title version 1.1
fixed conflict