cleaned up syntax
fixed conflict