fixing merge conflict
fixing tuesday
second post tim fix