Fixed commit merge