modified line cout (merge conflict testing)