merged my changed with layout