Update calendar.rb

Removed merge signs, leaved by mistake