Forcing merge conflict/adding author
Fixed merge conflict