added git l command
resolved conflicts