added a line
added another line
fix and merge