added from terminal
resolved conflicts