Missed bracket when resolving merge conflict.